Merge tag 'upstream/4.02.2' into experimental/master
authorStephane Glondu <steph@glondu.net>
Fri, 19 Jun 2015 15:59:21 +0000 (17:59 +0200)
committerStephane Glondu <steph@glondu.net>
Fri, 19 Jun 2015 15:59:21 +0000 (17:59 +0200)
commit68614aec43535c3677c7b0e3c75fbfd3f50eb411
tree737acc4bd3c1e526b921a875e8eb4617ec93ebbe
parent2488568d4a8b4f234d77cfbd858cab994e151ec2
parent4ad5ce933da9ad578817c63fb3aa53d5f3d3384d
Merge tag 'upstream/4.02.2' into experimental/master

Upstream version 4.02.2